Share the three copies of get_borders() under the name

2004-10-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkentry.h:
	* gtk/gtkentry.c:
	* gtk/gtkentrycompletion.c:
	* gtk/gtkspinbutton.c: Share the three copies of get_borders()
	under the name _gtk_entry_get_borders().  (#116368, Owen Taylor)

diff --git a/ChangeLog b/ChangeLog
index 6f84f74384c3b610cd8874793d2524668f454a7d..d66dafa6951ddd5feb70d2bfa6caa8f693a8f78e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.h:
+       * gtk/gtkentry.c: 
+       * gtk/gtkentrycompletion.c: 
+       * gtk/gtkspinbutton.c: Share the three copies of get_borders()
+       under the name _gtk_entry_get_borders().  (#116368, Owen Taylor)
+
 2004-10-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6f84f74384c3b610cd8874793d2524668f454a7d..d66dafa6951ddd5feb70d2bfa6caa8f693a8f78e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.h:
+       * gtk/gtkentry.c: 
+       * gtk/gtkentrycompletion.c: 
+       * gtk/gtkspinbutton.c: Share the three copies of get_borders()
+       under the name _gtk_entry_get_borders().  (#116368, Owen Taylor)
+
 2004-10-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6f84f74384c3b610cd8874793d2524668f454a7d..d66dafa6951ddd5feb70d2bfa6caa8f693a8f78e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.h:
+       * gtk/gtkentry.c: 
+       * gtk/gtkentrycompletion.c: 
+       * gtk/gtkspinbutton.c: Share the three copies of get_borders()
+       under the name _gtk_entry_get_borders().  (#116368, Owen Taylor)
+
 2004-10-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6f84f74384c3b610cd8874793d2524668f454a7d..d66dafa6951ddd5feb70d2bfa6caa8f693a8f78e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.h:
+       * gtk/gtkentry.c: 
+       * gtk/gtkentrycompletion.c: 
+       * gtk/gtkspinbutton.c: Share the three copies of get_borders()
+       under the name _gtk_entry_get_borders().  (#116368, Owen Taylor)
+
 2004-10-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free 

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a4b4935772274db34907fc374cf4834dfe2a7943..34b957e4ef4c8b43aa2ea407990d448b8a2ee47c 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1173,10 +1173,10 @@ gtk_entry_unrealize (GtkWidget *widget)
     (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
-static void
-get_borders (GtkEntry *entry,
-             gint     *xborder,
-             gint     *yborder)
+void
+_gtk_entry_get_borders (GtkEntry *entry,
+                       gint     *xborder,
+                       gint     *yborder)
 {
   GtkWidget *widget = GTK_WIDGET (entry);
   gint focus_width;
@@ -1223,7 +1223,7 @@ gtk_entry_size_request (GtkWidget      *widget,
   entry->ascent = pango_font_metrics_get_ascent (metrics);
   entry->descent = pango_font_metrics_get_descent (metrics);
   
-  get_borders (entry, &xborder, &yborder);
+  _gtk_entry_get_borders (entry, &xborder, &yborder);
   
   xborder += INNER_BORDER;
   yborder += INNER_BORDER;
@@ -1257,7 +1257,7 @@ get_text_area_size (GtkEntry *entry,
 
   gtk_widget_get_child_requisition (widget, &requisition);
 
-  get_borders (entry, &xborder, &yborder);
+  _gtk_entry_get_borders (entry, &xborder, &yborder);
 
   if (x)
     *x = xborder;

diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index e23a780a9a8daab8de74039b4dcc4fed8b330bd9..0c4c2aaa4ee2bd33b64a19f74b5b65cf926d6a79 100644 (file)
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -215,6 +215,12 @@ void       gtk_entry_set_editable                  (GtkEntry      *entry,
                                                 gboolean       editable);
 #endif /* GTK_DISABLE_DEPRECATED */
 
+/* private */
+void      _gtk_entry_get_borders                (GtkEntry *entry,
+                                                gint     *xborder,
+                                                gint     *yborder);
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index eb7288e239bf72a4339d9446697fb41c3484af21..089fb76534b8e39e4b3f061cc39f1738e3544120 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1221,39 +1221,6 @@ gtk_entry_completion_get_text_column (GtkEntryCompletion *completion)
 
 /* private */
 
-/* lame copy from gtkentry.c */
-static void
-get_borders (GtkEntry *entry,
-             gint     *xborder,
-             gint     *yborder)
-{
-  GtkWidget *widget = GTK_WIDGET (entry);
-  gint focus_width;
-  gboolean interior_focus;
-
-  gtk_widget_style_get (widget,
-                        "interior-focus", &interior_focus,
-                        "focus-line-width", &focus_width,
-                        NULL);
-
-  if (entry->has_frame)
-    {
-      *xborder = widget->style->xthickness;
-      *yborder = widget->style->ythickness;
-    }
-  else
-    {
-      *xborder = 0;
-      *yborder = 0;
-    }
-
-  if (!interior_focus)
-    {
-      *xborder += focus_width;
-      *yborder += focus_width;
-    }
-}
-
 static gboolean
 gtk_entry_completion_list_enter_notify (GtkWidget        *widget,
                                        GdkEventCrossing *event,
@@ -1293,7 +1260,7 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
   gint width;
   
   gdk_window_get_origin (completion->priv->entry->window, &x, &y);
-  get_borders (GTK_ENTRY (completion->priv->entry), &x_border, &y_border);
+  _gtk_entry_get_borders (GTK_ENTRY (completion->priv->entry), &x_border, &y_border);
 
   matches = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (completion->priv->filter_model), NULL);
 

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 794ee557d7165079cab92162df7c8e45a995b326..6d1e8bf73c8630338092d369a5b5229de350e851 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -617,40 +617,6 @@ compute_double_length (double val, int digits)
   return a + digits + extra;
 }
 
-/* Keep in sync with gtkentry.c !
- */
-static void
-get_borders (GtkEntry *entry,
-             gint     *xborder,
-             gint     *yborder)
-{
-  GtkWidget *widget = GTK_WIDGET (entry);
-  gint focus_width;
-  gboolean interior_focus;
-
-  gtk_widget_style_get (widget,
-                       "interior-focus", &interior_focus,
-                       "focus-line-width", &focus_width,
-                       NULL);
-
-  if (entry->has_frame)
-    {
-      *xborder = widget->style->xthickness;
-      *yborder = widget->style->ythickness;
-    }
-  else
-    {
-      *xborder = 0;
-      *yborder = 0;
-    }
-
-  if (!interior_focus)
-    {
-      *xborder += focus_width;
-      *yborder += focus_width;
-    }
-}
-
 static void
 gtk_spin_button_size_request (GtkWidget      *widget,
                              GtkRequisition *requisition)
@@ -709,7 +675,7 @@ gtk_spin_button_size_request (GtkWidget      *widget,
       w = PANGO_PIXELS (MIN (string_len, max_string_len) * digit_width);
       width = MAX (width, w);
       
-      get_borders (entry, &xborder, &yborder);
+      _gtk_entry_get_borders (entry, &xborder, &yborder);
       
       xborder += 2; /* INNER_BORDER */